Merge remote-tracking branch 'origin/master' into feature/android

diff --cc etc/NEWS
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/wid-edit.el
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/callproc.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/window.h
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge